Fixes #5702 - CV index call now respects environment_id correctly
Merge pull request #4079 from parthaa/cv-index

Fixes # 5702 - Updated CV index call to work with environment_id