Merge branch 'am/pathspec-f-f-checkout'