Addresses first patch automatically created under #3297465. However this issue will be left open should further changes be required before Drupal 10 is in beta.