Merge pull request #2732 from radical/asm_remap