Merge "Add resource to disable cb" into sc-dev