Port remaining part of e0d230fb37848efd788eea54a83869a63ff0fb39, 20e85c0e837ef17219a1c317d7962286c9b4237d and 9d45a444f90ca6b939eecb52167fc7f39765c438 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
#hashtag