Merge branch 'jk/add-p-commentchar-fix' into maint