Merge "Follow up of IInputConnectionWrapper" into sc-dev