Merge branch 'gp/maint-rebase-p-onto'