BZ-999999: Merge last RC fixes
Merge branch 'Sprint73-DV' of https://github.com/NoesisEnergy/bootstrap into Sprint73-DV