Merge changes from tedit-app