incremental patches to 3.0.31