Merge v2.43 updates into 3.0 code