(cherry picked from commit 3b6179f1) (cherry picked from commit 049fb020)
mentioned in commit e3973cad