(cherry picked from commit 06d98bdc) (cherry picked from commit 8758580e)
mentioned in commit 9bd14549
mentioned in commit b80ea9e3