Merge "Skip call for deprecated HAL" into main