Merge branch 'cmdline_breakingBatch' into 'commandline_parsing'

Cmdline breaking batch

See merge request !258
7 jobs for commandline_parsing in 65 minutes and 25 seconds (queued for 3 seconds)