TestBed2: IN SYNC WITH new-chronotext-toolkit / ResRework BRANCH (COMMIT 2ef2b77)
TestBed2: IN SYNC WITH new-chronotext-toolkit / ResRework BRANCH (COMMIT 0cac570)