Merge branch 'as/test-name-alias-uniquely' into maint