Merge branch 'qbe' into test