Migration to VS 2017