hht2
Merge branch 'hotfix/hht'
dafaf1