Merge branches 'sh/hwblk' and 'sh/pm-runtime'