ContextRework AND TestBed2: IN SYNC WITH new-chronotext-toolkit / develop BRANCH (COMMIT 87da8dc)