Merge branch 'sb/checkout-test-complex-path'