Update atomic, align from develop.