Merge commit '20aec2dd' into eclair-mr2 * commit '20aec2dd': addresses several bugs: 2206097, 2166583, 2261119, 2216759