Merge "Add resource to disable cb"