REPORT-649 - Allow customization of output filename