KRACOEUS-7937 : Business Rules Improvements 2