Fix TE edit view constraints
Merge branch 'master' into builds
7.165