Merge pull request #1016 from arrbee/fix-checkout-dir-removal Update checkout with new strategies & behavior