Modifications for the Control model to work on new builds.
Merge pull request #678 from mfalesni/control_update_for_upstream

Modifications for the Control model to work on new builds.