Merge branch 'tr/reset-checkout-patch'