Merge "delete recovery policy on changing build types"