(cherry picked from commit 080a6027) (cherry picked from commit 98365420)
mentioned in commit 2e2459e8