Merge branch 'ho/shared'