Closing branch after having merged the changes to events to the main 6.0...

....0 branch.