CLC-4230 - Fix merge conflicts