work in progress
refactor based on removal of content_file= method
Merge branch 'develop' into file-content-datastream