ContextRework AND TestBed2: IN SYNC WITH new-chronotext-toolkit / ResRework BRANCH (COMMIT b33c7e3)