Update atomic from develop.