Updates to support new start/stop task functionality.