(cherry picked from commit 253f714f) Forward-pick from staging to staging-next. It's quite small rebuild, compared to what's caused by the parent commit.