Merge branch 'rr/rerere-libify-clear-gc'