Update atomic from master.