Merge branch 'bidir-deadlock.2' into bidir-deadlock