Merge branch 'be2net-fixes'