Merge branch 'nd/apply-doc'