Merge "Return null when user is locked" into nyc-dev