Added changes from override directory changes from other project.