DE-12 is fixed
Merge branch 'hotfix/DE-12'