Merge develop branch from ARvis - fix when OpenCV not found