LPS-50547 Backport fixes