Merge pull request #3854 from DanNixon/simplify_prearm_check_confition