KRACOEUS-7078: suggested fix and cleanups for PR72