Merge all commits from Francois about Project checked