(Bsmiles32) Backport - Replace EPC macro