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

Bidir deadlock

See merge request !49