Merge branch 'fix/hsu' into fixes