Follow up on #9852: v2 to v3 of the patch