Removed editor integration and point to TSE
Merge from dev