Merge branch 'rs/show-branch-argv-array' into maint