JIRAs ready to be integrated

[Ted Yu]

Hi,
The following JIRAs are ready to be committed:
4065, 4199, 4236, 4237

Please comment if you think otherwise.

Thanks