Update cherry-pick commit
Increment version number