Merge pull request #2174 from rosysong/lease-status