Fix CI_URI:: not being properly indexed
Merge branch 'develop' into feature/output_compressed_cache