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