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