FUL-306: change the getEvent method in order to make it similar to the repository
merge rc1.2.0 to master