LPS-48728 Push to upstream