(cherry picked from commit 3ccc7d07) (cherry picked from commit ee0abc08)
mentioned in commit 410f4807