Merged changes from "Assoc update cleanup and added testcases" PR
Merge pull request #2391 from Benglin/RC0.7.2_master

Merged changes from "Assoc update cleanup and added testcases" PR