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

This reverts commit efce5d7e3be6da1b98ee691d291117d3bc40474c.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the r2_control sub directory