Merge branch 'textElement' into backend