Merge changes on external branch
Fix EStop toggling

WHO'S DOING QC ON THIS CODE?! CHECK MINUS!