Merge branch 'nd/apply-doc' into maint