Does the #13291 should contains in 2.8.2

[ZhangJian He]

Hello,
@LinLin @lipenghui

I want to discuss if #13291 should contains in release 2.8.2.

It's a compatible problem since 2.8, and we already commited it to master
and branch 2.9


Thanks
ZhangJian He