LPS-42790

For master. pull request for ee-6.2.x is different