Merge "Fix volatile wide put/get to be atomic on x86 arch"