what a mess
Merge branch 'master' into devel
...
fix
attribute resolver integration
m-n
continued work on attribute resolver
created attribute resolver