disable full rebuild until it can be partitioned
Add some debug logging
Merge with main