Merge change 25147 into eclair

* changes:
  Fix call collision issue