(Bsmiles32) Backport - replace Status macro