(Bsmiles32) Backport - replace Cause macro