refs #7108. Missed old api calls.
Merge branch 'feature/7108_conjoin_files' into develop