Merge branch 'test-arm64' into 'master'

Fix the tests for arm64

See merge request !61
6 jobs for master in 26 minutes and 57 seconds (queued for 4 seconds)