Merge branch 'dl/config-alias-doc' into maint