Merge branch 'rs/receive-pack-cleanup'