Merge branch 'texformat-rework'