Rename economy
and create index
extension
#5705
Merged
economy
and create index
extension
#5705