This is already part of a patch for 3.17.7