Merge "New C++ helper classes." into idea133