am 20aec2dd: Merge change I830df4b1 into eclair

Merge commit '20aec2ddee1b82fa59cc4537d6b42b6897bc30ca' into eclair-mr2

* commit '20aec2ddee1b82fa59cc4537d6b42b6897bc30ca':
  addresses several bugs: 2206097, 2166583, 2261119, 2216759