Merge branch 'bw/commit-partial-from-subdirectory-fix'