Merge branch 'pt/enter-repo-comment-fix' into maint