Merge branch 'sh/urgent' into sh-latest