Merge "Set up config update code path"