Partial port of b8a2430642 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
b8a2430642