Merge branch 'sh/kgdb' into sh-latest