Code ready for launch test.
Merge branch 'atlas-sm'