Using config_distro update ('merge').
Also, the user migration was updated to migrate the data of these fields.