LPS-35678

Please, test it to make sure that everything is working as expected.
Thx!