Exposing behavior wrapped by multi-instance behavior
Merge remote-tracking branch 'upstream/master'