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

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