Merge branch 'pt/pull-tests' into pt/pull-optparse