Upgrade query and consumer.
Merge pull request #883 from control-center/feature/isvcs-v15

Upgrade query and consumer.
Merge branch 'v5.0.0b2' into develop