(cherry picked from commit 0b1b0a01) (cherry picked from commit 3c69813c)
mentioned in commit b4316882