Fix scenario defintion and related bugs in dynaman
fix problem with messages and callbacks
merge origin/relation
Fix merge problems