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