Merge change I4db11d50 into eclair

* changes:
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.