BZ 1128609 aligment with EAP 6.3 versions