Squashed update to 3.0.101