backport config normalization