Fixed Merge issues EPR : 389110