Fix for OOIION-681 - Implement Higher Level Org Events