Merge commit '6d6c321f9dfcdbecac610d990ee9fa0f102dccdb' * commit '6d6c321f9dfcdbecac610d990ee9fa0f102dccdb': Cherry-pick from mr2 to eclair: DO NOT MERGE