Merge branch 'wg-fixes'