(cherry picked from commit c1c28fe2) (cherry picked from commit 972391ac)
mentioned in commit 88b6379b