* commit 'bc4ddef479011e200d0273fe73c22922a85de1fe': DO NOT MERGE Revert "Fix lease duration handling"