reverse merge form dev.
Fixed more stop bugs.
Fixed start stop issue.