So, rewrite using Common/Atomics instead of std::atomic ? will do!