KRACOEUS-7051: fixing bad rebase
KRACOEUS-7051: responding to code review comments