Removed redundant spans
Merge pull request #7409 from robbytaylor/feature/remove-redundant-spans

Removed redundant spans