Merge "Give guidance on alternatives to deprecated locale field" into nyc-dev