Done in remote_play pull request