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