Merge branch 'qed-static-checker'