Try to fix billable in TE editor (win)
Merge branch 'master' into builds
7.820