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