(cherry picked from commit 95f82ae9) (cherry picked from commit 2589995a)
mentioned in commit 18b7b7fe