Project fix after merge with development.