test
filter out pending acks when folding over delta
merge bug25400 into default