#1650: New version of patch
Merge pull request #4098 from openscholar/1650-cp_files_schema_filter

New version of patch