LPS-42778

[TECH-SUPPORT] Hey Iliyan, can you review this fix? thank you