CFR / FA - Drupal 7 Patches