Merge "Fix parameter generation" into main