Port 6637ecb460460dfc0a6e55906dd4507839c9b1c7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port b4394ec12954414b7d601473ecb21a49d9558082 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>