'De-atomic'
It compiles
Merge branch 'feature/cxx03' into develop