Merge branch 'tr/remote-tighten-commandline-parsing' into maint