Merge branch 'hotfix/bug_fix2'
Fixed a bug with sorting columns for most tables other than datatable tables.
Merge branch 'hotfix/bug_fix3' into develop