[PATCH 1/2] Enable C++