Merge branch 'sh/pm-runtime' into sh-latest