Pull asm-slot-fix into release branch