Merge branch 'gb/split-cmdline-errmsg'