- merged latest changes from NewPipe's dev branch