Merge "Merge ControlledInputConnectionWrapper into parent class" into sc-dev