Cherry-pick fix
Merge fix