Merge branch 'new-display-edit-textbox-concept'