KRACOEUS-7012 pull request changes