In fact, it was not supposed to be in the pull request.
Sorry.
I suggest you just to pick the functional tests modified plus the modification on Cache.php function Checkconditions ...