Merge branch 'as/api-allocation-doc' into maint