Merge branch 'bc/maint-api-doc-parked' into maint