merge in ub-now-queens-release history after reset to c8f4e1bc88401cad3cc5e439cd08450974d99d81