2 #12

Closed
pt3ulnghe wants to merge 7 commits from feature/hql into develop