Check for breadcrumbs only where relevant
am: c31f1f3f6e

* commit 'c31f1f3f6eb240edee5dffffce0156a6e969d223':
  Check for breadcrumbs only where relevant