Merge branch 'as/doc-for-devs' into maint