Merge "Make server action methods[a-c] use **kwargs"