Merge "Add "server" to action methods"