TE-2 fixed
Merge branch 'hotfix/TE-2'