Merge branch 'playlists' into freeze-break