Merge branch 'sh/stable-updates'