Post-2.0.4 updates to unstable