Merge branches 'version3' and 'temp8' into version3
Merge branches 'version3' and 'temp9' into version3
stop flag no longer being set during short stops