Merge "fix confusion between "input" and "output""