Merge modifs from customer project.