Merge branch 'develop' into 'updateextlayout'

# Conflicts:
#   composer.lock
2 jobs for updateextlayout in 2 minutes and 29 seconds (queued for 2 seconds)