LPS-46995 Fix refactor