Merge "Fix issue where player wouldn't expire" into rvc-dev