More robust fetching of next block order

Bug 1338410

Change-Id: I5a15029b9c7fdaccd76072f632ef59234c22e835
Merge "More robust fetching of next block order"