Merge "Retain loaders through stopped config changes" into nyc-dev