MT#7349 deal with previous config