HAL-265: Several GIU enhancements