[MOD][T6966] Change fields positions

Merged diego.barreto requested to merge T6966 into 12.0

Merge request reports