LPS-33077

Hey Ray,

I received this pull from support Hungary. I reveiwed it and didn't see anythins specially wrong but you have more knowledge about this, specially to judge whether the changes in 65b5e1b and f15aec6 make sense.