Applied CB_global_var.patch which was created from past work. Note: The patch file patches some stuff that should NOT be part of CB Global Variable changes.