Merge "fix recursion for config change" into nyc-dev