Merge pull request #9616 from TonyBlit/fix_alt_before_arm