Added force start and stop.
Merge branch 'test' into dev