v13 port because otherwise backports will result in conflicts always
(cherry picked from commit e4c220053f)
e4c220053f