Revert "Trimmed the branch to only the compatibility/control sub directory"

This reverts commit efbb54ff583e07694b63d381bd1ba0f76638e39d.
Rebase from 'upstream' @ version '1.1.4'
Trimmed the branch to only the compatibility/control sub directory