Started backporting changes from server to repo.