Also includes some cleanup. Must merge [#3457165] first as it increases the Drupal Core requirements to 10.3.