BZ-0000: fix build errors
Merge branch 'Sprint73-DV' into integration