R16 fix upf features

Merged Rohan requested to merge r16_fix_upf_features into develop

Handle additional upf features fields.

Merge request reports