Fix HSI more properly
Merge branch 'exp' into stable