Merge branch 'tests/upload_filters' into 'develop'