Merge change 21603 into eclair

* changes:
  Fix infinite recursion.