LPS-45576

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