Merge branch 'sg/rerere-gc-old-still-used'