Merge branch 'hso-next'