Resolve "Add output-options as alias of output_options"

Merged Francis Dupont requested to merge 3003-add-output-options-as-alias-of-output_options into master

Merge request reports