Bring soc branch up to date with main

Created by: infinitymdm

Merge the main branch into soc. This brings SoC config work back inline with Wally development.