#915: THU and TT edits, also #588
opened by TillmannTaape