LPS-39688 Pushed to master