Merge branch 'hotfix/fix-data-table'
fixed filter.ui bug
Merge branch 'hotfix/bugfix-filter-ui-theme' into develop