Revert "Trimmed the branch to only the rosatomic sub directory"

This reverts commit a98eca9c2a85aa6342d16aaabe96dd72b46ac800.
Rebase from 'upstream'
Trimmed the branch to only the rosatomic sub directory