More work on eventing
Merge branch 'newdev' of github.com:k-int/KBPlus into newdev