Minor fix due to merging of persistency-check and rebalance-bug-fix branches