Update atomic from master.
Update utility from master.