Updating default settings as MDL-41421 is integrated