Merged changes from build server.