KRACOEUS-7937, KRACOEUS-7518 : Code review changes 2