(cherry picked from commit 160dadc0) (cherry picked from commit 7563de50)
mentioned in commit ab927db9