BZ-9683: Simplifying code.
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap