KRACOEUS-7937 : Further code review changes