Rewrite of TP logic to enable incremental group updates (potential
issues with mixed full and incremental updates)