Merge pull request #2683 from nfedera/fix-shadow-server