Merge branch 'develop' into 'composer/set-event-mgt-to-stable'

# Conflicts:
#   composer.json
2 jobs for composer/set-event-mgt-to-stable in 3 minutes and 17 seconds