LPS-36313 Push to upstream