Merge pull request #554 from shaitan/master

Recovery fixes
v2.26.3.30