Merge branch 'origin/master'
allow multiple filters of single dataset
Merge branch 'DataLoadingUI'