Update core, atomic from develop.