Merge change 8569

* changes:
  Fix 1993520 where page cycler fails.