Merge branch 'jk/guess-repo-name-regression-fix'