Merge "Make server action methods[f-l] use **kwargs"