Merged optimization changes and server to provide pull request.