Merge "Conditionally remove the package->id association and NOT the player" into rvc-dev