Merge branch 'bidir-deadlock' into 'ibm-trunk'