merge ee52ec11acf57db97003c55b72d76fc6a77e4138 as cherry pick