Merge branch 'sh-sci' into soc3-base