Merged 2.3.99.4 changes to trunk