Cherry-pick changes