EventDispatcher refactor and changes to exception types and shutdown workflow
PLUG-2, PLUG-4 and PLUG-7 fixes
Merge branch 'PLUG2Fix'