Re: Backport commit b7363e67 to stable 4.9.y