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

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