Upgrade to 0.20.4