IOT-2539 Fix -Wmissing-field-initializers