Merge "Fix config switching"