LPS-42611

[TECH-SUPPORT] Simplified the original pull-request, also I've tested again and it's working fine. Can you review it? Thank you.