Merge for the running prototype.