Merge branch 'hs/7873'