Fixes #700
Port 66dbb59aa1 to glitch-soc
66dbb59aa1
Port 9a1a55ce52 to glitch-soc
9a1a55ce52
Port missing changes from 4e4f1b0dcb to glitch-soc
4e4f1b0dcb