Merge branch 'nd/log-n-doc' into maint