LPS-45229

Hey Ray,

@leventehudak has alredy discussed this issue with you and I think since the fix is not really staging related and you have much more experience on this area could you please review this change? 

thanks,
Daniel