LPS-37672

The ticket is not done yet, more commits are coming.