LPS-39277 Recommit
LPS-39277 Fix tests