port: BEM-406
port: BEM-406
Merge branch 'i-406' into support/0.6.x
level scanner: use proper suffix for folders representing block with mod
and val (reference #406)