Nvidia index 2.3 for release

---

This backports some changes from master for IndeX for the 5.7 release. Namely !620 (merged) and !611 (merged).

Cc: @eolivares