LPS-34512 Further change.