Merge change I830df4b1 into eclair

* changes:
  addresses several bugs: 2206097, 2166583, 2261119, 2216759