Merge "Fix the CAS spinlock implementation" into integration