Merge "Edit warning should get value from editors"