More changes for merge script.