Bug Fixes for product associations update
Merge branch 'Dashboard-first-part'