REPORT-649 - addressing code review comments for: Allow customization of output filename