Merge "Removed FLAG_ADVANCED." into nyc-dev