Merge "Inline settings update." into nyc-dev