LPS-51184

Don't backport last commit