Merge branch 'gc/branch-recurse-submodules-fix'