Merge commit 'smcv/atom'