Merge branch 'develop' into 'updateT3olayout'

# Conflicts:
#   composer.lock
2 jobs for updateT3olayout in 1 minute and 25 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #821
build

00:00:58

 
  Layout
passed #822
layout

00:00:27