Merge branch 'develop' into 'updateT3olayout'

# Conflicts:
#   composer.lock
2 jobs for updateT3olayout in 1 minute and 25 seconds (queued for 3 seconds)