Merge branch 'restext'