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

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