Manual cherry picking of pull request #392