[GAE Server] Merged changes made by Leo in pull request