Fix HAL-232: Extended security api