Gone checkbox for server
Merge commit