Further sync with my local SoC development environment