Merge "Fix exception when trying to update config of detached stack" into nyc-dev