Merge "Add memory ordering constraint, convert to C11 atomics"