More changes to make merge build.