Merge branches 'sh/xstate', 'sh/hw-breakpoints' and 'sh/stable-updates'