Reset while stepping improvements
Merge pull request #3690 from Kingcom/Reset

Reset while stepping improvements