[COOK-3347] Fix issues with merging master back