The Drupal 6 to 8 Upgrade Challenge - Part 3