should fix #612
Merge branch '612-landing_after_retry_on_page' into develop