Merge branch 'heads/soc2' into dt3-base