Merge branch 'hsi-fixes'