Merge branch 'i0x-main-patch-141d' into 'main'

bugfix, preserve cmdline args

See merge request !57