#1210: TT edits from annotation work

opened by TillmannTaape