PAHMA-939: KIR/OIR fails when certain XML elements are not present in Name & Desc. fieldset
Merge remote-tracking branch 'upstream/master'