Re: Request to cherry-pick 01ea173e103edd5ec41acec65b9261b87e123fc2 to v5.10