(Bsmiles32) Backport - Replace PRevID macro