Merge branch 'be2net-error-recovery-and-bug-fixes'