Merge branch 'ui-textlayout-optimisation'