fix renter
optimize long renter
Merge branch 'master' into development