merge SPC-for-args tarsius/pr/squash guess-unpulled