CS-3425

[Vijayendra Bhamidipati]

Hi Hugo,

Can you please take a quick look at the fix put up at 
https://reviews.apache.org/r/12369/ and provide your review comments? Thanks!

Regards,
Vijay