Merge pull request #13431 from carlyin0801/issue_13429_atom_fail_skip_condition