Complements e2d6e14662d780383e18066a3182155fb5b7747b. Backport of db613f4f1250971942f766dcf97c22234a3aa14e from master