Case #2871 - Made various fields optional