LPS-46267 WIP

Please, finish it