LPS-43888 Apply

Pushed to master