(Bsmiles32) Backport - Replace Config macro