Change findByFrom to public
Merge branch 'fix-csv-import' into develop