(cherry picked from commit 8ab34a49) (cherry picked from commit 480fd820)
mentioned in commit 1f31fdff