CRM-14850, CRM-15089 - Fix for debug setting