LPS-38386

This is the last pull for this ticket, you can close it after the merge.