Merge "Update ASM usage to ASM9"