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