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

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