Merge "Consistent pending and trashed expirations." into rvc-dev