Issue #5215: Indexed with test cases

Indexed with test cases