Merge branch 'sh/st-integration' into sh/urgent