LPS-46270 Adapt to changes in LPS-46267