moving to vsm master branch