Upgrade to Devkit 3.5.0-SNAPSHOT