split this off
Merge branch 'master' into inheritancerefactor
add trait usages
Merge branch 'master' into inheritancerefactor
Merge branch 'master' into inheritancerefactor
cosmetics
Merge branch 'master' into inheritancerefactor
better error msg
fix trait use
Merge branch 'master' into inheritancerefactor
Merge branch 'master' into inheritancerefactor