Merge "Add new soft parameters"