CB-9133 Adds support for CDVFILE. This closes #6