Merge branch 'sh/hwblk' into sh/pm-runtime