Merge branch 'sh/hwblk' into sh-latest