LPS-38220

This is the last commit of LPS-38220.
You can close the ticket after you merge this pull.