Merge branches 'sh/urgent' and 'sh/platform-updates' into sh-latest