Merge "Replace deprecated __ASSEMBLY__ macro with __ASSEMBLER__" into integration