Matching branch for tracker-miners. See tracker!172 (merged) for a more detailed description of the changes.
