Show containing areas in place inline search
Merge remote-tracking branch 'chirlu/mbs-6886' into beta

* chirlu/mbs-6886:
  Show containing areas in place inline search