(bsmiles32) Backport - replace Index macro