Merge pull request #16125 from alalek:core_safe_xadd