[by ann] migrating to asm5
backporting migration to asm5