Merge "Deprecated a flag for mandatary field" into nyc-dev