BZ-99999: fix bad merge
Merge branch 'Sprint74-DV' into release-candidate