Merge "Ensure expired leases are ignored and deleted." into rvc-dev