LPS-39625

Fixed merge conflicts