Patch up to 3.0.58

Change-Id: I2264dbafda3a691c514cff3fae7c16c3d0a2f488