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