Fix rollup repair
Merge pull request #260 from lakshmi-kannan/bf_fix_rollup_repair

Fix rollup repair