Merge branch 'atomic-ref'