BZ-9999-merge latest chnage on EBP branch