#7 Support Aql2Hql
Merge branch 'master' into validate