Branch containing all 3.0 changes