Merge "Upgrade ASM to 9.6" into main