case 3805 - Drupal way of storing cache.
case 3805 - Debug removed.
case 3805 - CR fixes.
Merge branch 'case-3805' into new-search