merge from private branch for asm and memory playback patch