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