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

This reverts commit 400e6d2c0a5f3983e9b3714aeac705276549366c.
Rebase from 'upstream'
Trimmed the branch to only the rocon_interactions sub directory