CoreBug Related Changes