LPS-48189 move logic to the base indexer
LPS-48189 SF