Merge branches 'version3' and 'temp99' into version3
computer vision state machine v2 update