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