Merge branch 'heads/soc2' into boards2-base