(cherry picked from commit e17f2df9) (cherry picked from commit 9a2f3313)
mentioned in commit 998480a8
mentioned in commit 4533d5ce
mentioned in commit 45c008f2
mentioned in commit bdc39308