Custom aql structures
Merge branch 'f-aqlbuilder' into dev

* f-aqlbuilder:
  Custom aql structures