Merge of POBAD_CC removal from 3.0