Merge branch 'its9802' into 'master'

ITS#9802 Fix argv handling

See merge request !515
3 jobs for !515 with its9802 into master in 45 minutes and 15 seconds (queued for 1 second)