update association loading control
Merge branch 'develop'