3 #13

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