Merge branch 'master' into sh/hw-breakpoints