Merge "Fix invalid values when setting config options' default value"