Merge branch 'gp/maint-diffdoc' into maint