better handle when unexpected pages are received.
Merge branch 'master' into 2.6.0