Merge change Id8e98194 into eclair

* changes:
  Fix issues 2333450 and 2333559: