LPS-45577

Hey Máté, Can you review and resend this fix? thanks