Adding Patch as MR

Mahima Mathurrequested to merge
issue/flag-2943153:2943153-flag-sort into 5.x

Converting #9 patch to MR

Merge request reports