Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3