Merge pull request #35196 from rohitwaghchaure/fixed-order-of-reposting-entry

fix: pick the in progress reposting entries first