KRACOEUS-7561, KRACOEUS-7603 : Code review changes