Request for backport fd6bc19d7676 to 4.14 and 4.19 branch