Update to latest 0.20.4