Macro Corrupted Owner Chain Fix for 2.1.x

Fix macro corrupted owner chain problem for 2.1.x branch.