Bug 1102228 improve data cycling

See commit message