(cherry picked from commit 4d59e14f) (cherry picked from commit 45dca7fe)
mentioned in commit f361a717