Merge "Let shared user checking to be backward-compatible"