blocking 52fb89501ce6202b84fa60f7f7d7f47de55d6240, it's the last backmerge from this branch]