Synced three_cpp r65 branch