Re: Backport commit f634ca650f72 for 5.10.y, 5.4.y & 4.19.y