Accidental addition of later PR
Merge with tracklist-provider