upstream-v4.2.0
c547a11b · v4.2.0 (#4309) ·