CB-6437 Merge conflicts resolved