tehKaiN Merge branch 'recovery-dbl-bfr'