Merge "Bug 1355: Fixed incorrect input keyword use in rpc"