KRACOEUS-6956 : repack propdev fixes upon comments