LPS-51323 Fix backport