[development] DRUPAL-4-7 critical issues