merge of #2837 atomic_get_set intermittent error