5854540e8c
Port remaining changes from dba4be1038 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>