Merge "when printing requery on UI warning, include additional info"