merge in ub-now-queens-release history after reset to 0e974b4d4480242c768cbd886d02ea66c0c8643d