Updated with 3.0.43 changes