Add a blueprint for #7631.