Integrated all changes and updates from other projects.