Merge "Revert "vendor/bliss: BlissMas Time!!"" into p9.0