Update #3424 by Henry: Update the yeoman and the project scaffold