GIT-37a6.4: Fixed merge conflicts