PICK

The given commit is to be cherry-picked.

The client should commit the changes and continue if there are no conflicts.