Port e0b1e17bd04d7f9b533ab462aee4544a5f5fb926 to glitch-soc
Port missing changes from 4e4f1b0dcb386464d653fcce765ca775e566a03c to glitch-soc