make listing pages more failure resilient
Merge branch 'develop' into qa

* develop:
  make listing pages more failure resilient