Merge "Removed unnecessary try-catch from Control base class" into devel/master