Merge "Fix default for remove_labels setting"