Upgrades to 3.0.20-develop