KRACOEUS-6958: changes from review of pull request #16