[#10617] Update Feature, fix order of fields