backport assembler improvements from the engine