Merge "Redlines for inline settings." into nyc-dev