Merge "Speed up single-stepping"