Port 38c6216082 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
38c6216082
Port d27216dc46 to glitch-soc
d27216dc46
Fixes #1965