Merge branch 'atomic'