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
Status Job ID Name Coverage
  Build
passed #6066
build

00:01:43

 
  Layout
passed #6067
layout

00:01:34