Merge branch 'arm7' into 'master'

arm7

See merge request !3
1 job for master in 28 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #159450
build

00:00:28