CPP UPGRADE: FOLLOWING “REFERENCE VERSION” IN new-chronotext-toolkit / ContextRework BRANCH (COMMIT 1e3d3d0)