From: Artem Bityutskiy <Artem.Bityutskiy at nokia.com> Hi, I've sent these patches here already, but now I've re-written the commit message, tested them, see that recovery does not fail anymore, and I am going to merge them upstream and to the -stable trees. Artem.