Merge branch 'th/maint-remote-update-help-string' into maint