Render header view as part of TE list view, only
Merge branch 'master' into builds
7.184