Integrated changes from other projects.