(cherry picked from commit 9d5acfab) (cherry picked from commit 1579dce2)
mentioned in commit 7b6b7abf