Merge "BUG-1202 : PCEP:implemented make-before-break"