Merge "Fixed bug in disassembly of roundss/roundsd"