(cherry picked from commit 01de0a84) (cherry picked from commit 00b74b0c)
mentioned in commit e9cde297