Merge "Fix intermittent test failure of Delta between anchors"