Port e0b1e17bd0 to glitch-soc
e0b1e17bd0
Port missing changes from 4e4f1b0dcb to glitch-soc
4e4f1b0dcb