Update to latest ASM
Merge