Merge pull request #9435 from breadoven/abo_mc_nav_arm_safety_fix