DEVTOOLS: Merge the latest create_project changes