Merge branch 'test' into 'dev'

# Conflicts:
#   src/assets/config/m3apps.test.json
2 jobs for dev in 3 minutes and 31 seconds (queued for 1 minute and 55 seconds)