Add 17.2 C++ solution

Please merge 17.2 Branch to Master