Major refactoring to YAQL-based syntax
Merge remote-tracking branch 'upstream/master'