(cherry picked from commit 137d4487) (cherry picked from commit 98a34946)
mentioned in commit b754ff8b