Merged latest tolk changes (JAWS fix)