Update to version 12.0.1
Merge branch 'master' into asm