To cherry-pick the new project scala files