Merge "Fix for bidirectional support." into devel/master