Citizen

cherry-pick hide automatically created users related commits