Merge pull request #6549 from systemcrash/ra_lease