Merge branch '2384-playlist'