Config migration to v3.5
Minor