Merge "Use <atomic> instead of <stdatomic.h>" into main