(cherry picked from commit 6a0667d2) (cherry picked from commit 0aed6189)
mentioned in commit 9d1eb34a