Migrate from 3.4 to 3.5 config
Migrate from 3.4 to 3.5 config