Merge "Add "server" to action methods - part 2"