Merge branch 'sh/platform-updates' into sh-latest