Merge commit 'fc023055dba94779d5ab5455c1eab071e00a786e' * commit 'fc023055dba94779d5ab5455c1eab071e00a786e': do not merge - Fix for issue 2184627 cherry picked from eclair-mr2