(cherry picked from commit 0f849d0a) (cherry picked from commit e42f9add)
mentioned in commit 741c8b76
mentioned in commit 13cb5986