Initialize scanmask structure earlier to avoid NREs on generating fresh deposits
Merge branch 'release-0.7'