[Commit request] Trinidad - 2433 and 2428

[Anand V. Nath]

Hello Dev,

Can someone review and commit the patch in TRINDAD-2433 and TRINIDAD-2428?

Thanks
Anand