Merge pull request #4531 from tiennou/fix/checkout-default-safe checkout: change default strategy to SAFE