(Bsmiles32) Backport - replace macro