Merge branches 'sh/hwblk', 'sh/cpuidle' and 'sh/stable-updates'