Merge branch 'bad-merge-keep-a-reference-to-ASM7_EXPERIMENTAL' into 'master'

merge failure so a ref to ASM7_EXPERIMENTAL was not replaced by ASM7

See merge request !209
1 job from master in 7 minutes and 20 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #6253
build

00:07:20