Port c45ce549afe17cca1ba474a67112038e5966f68e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>