Merged back changes done in other projects.