BATCH-2282: SplitBuilder shouldn't add empty state in flow