Merge branch 'CB-6503'