r4231: commiting changes to 3.0.10