Similar to the backport request thread in 2.2 release #6036

The issue is to track 2.5 release backport.

For any PRs you want to backport to 2.5, please reply with following:

Original PR link
Reason to backport
2.5 backport PR link