LPS-32849 Apply new staging data handler pattern