Merge patch series "target: TMF and recovery fixes"