Master branch merge for VS build success