Merge pull request #4501 from Ansuel/fix-lease