JIRAs ready to be committed

[Ted Yu]

Hi,
The following JIRAs are ready to be integrated:
4340, 4331, 4007

If you have comment, please share.

I plan to integrate them over the weekend.

Thanks