BZ-9751: fix calculator prefix and suffixes
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap.git