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

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