Merge "Reduced some master queries via Revision::READ_NORMAL."