normalized roc and event bus registrations
Merge branch 'release/v0.0.23'