Trying to get estop working
fixed merge conflict.
Merge branch 'master' into Test-Branch
fixed estop functionality.