Pull additional debugging info from master into v3.0.x