(cherry picked from commit 9dfb429a) (cherry picked from commit 9f727405)
mentioned in commit 53d18604