Merge branch 'fix/events' into develop
Bump version to 1.5.1
Merge branch 'release-1_5_1'