Merge "BpBase -> BpHwBase"