Update to 3.0.101 upstream