Avoid duplicate breadcrumbs in fix for #1039
Merge branch 'issues/breadcrumbs-1046-1039-1030'