Merge "Enforce HAL callbacks"