LPS-42604 Use existing function