Merge "fixing input and output action"