Merge pull request #9697 from annando/improved-server