fix hql request v2
fix hql request v2
fix hql request v2
Merge origin/master