Issue #5215: Modify some index list