Merge branch 'nk/ref-doc' into maint