Merge "DO NOT MERGE: Add separate information about user whitelist." into nyc-dev