C++ patches for ABC (needed for stp) - View it on GitHub