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