(bsmiles32) Backport - Replace ErrorEPC macro