Cleaning up the mess
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Cleaned up FilterDialog
Merge remote-tracking branch 'origin/master'