Merge "Fix issue where media would not expire" into rvc-dev