Merge branches 'sh/hwblk' and 'sh/platform-updates'