Merge branch 'origin/develop' and add /test project to VS solution.