Manual merge of play-queue branch