(Bsmiles32) Backport - Replace Context macro