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