Fix hack_driver
Merge branch 'ql-refactor' into sam_ql_refactor_compile