[TASK] order field padding fix (RT-2799)