Merge "Default is not necessary for toggle fields"