c++ setup test - all perfect
c++ setup test - all perfect
c++ setup test - all perfect
Merge origin/master