LPS-32115

More commits are on the way, please leave the ticket open.