Merge "Add userParams as inputs"