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

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