Merge branch 'be2net-non-critical-fixes'