[rt #69879] various T1 improvments