LPS-51490 Fix backport