[Observe-commits] [Git][ultreiaio/ird-observe][develop] Fix WithIndex generation - See #1203