Cherry-pick merge