Merge branch 'br-next-fixes'