(cherry picked from commit df696b14) (cherry picked from commit 16e4cfcc)
mentioned in commit 3528ace8