Merge "Change Internal::Control destructor to protected" into devel/master