Re: backport 790756c7e022 to 4.14 and 4.19?