Merge "swift expects an internal client config to start"