Added fixes for category insert.
Merge branch 'refs/heads/development' into ag.home_tab_summary