Update lockfree from master.