Cherry-pick merge from master