drop patch merged upstream (cherry picked from commit 951017ffb6)
951017ffb6
(cherry picked from commit a8dcf3ae61)
a8dcf3ae61