Added `atomic` keyword on TODO list.
Merge branch 'master' into packaging