Merge branch 'qeth-fixes'