(cherry picked from commit 1cee1c52) (cherry picked from commit ffccc15f)
mentioned in commit de5a3336