Upgrade to DevKit 3.5.0-SNAPSHOT