Port remaining changes from 563964dd80 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
563964dd80
Port 19b4c36e40 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
19b4c36e40