Port 9a1a55ce526c956ac6b35897d483c316b7ad4394 to glitch-soc
Port missing changes from 4e4f1b0dcb386464d653fcce765ca775e566a03c to glitch-soc