Merge "Make concurrently accessed globals atomic"