Merge pull request #7909 from breadoven/abo_landing_detector_nav_define_fix