Merge Spotify into main branch