Merge "Add apex_defaults for consumerir HAL APEX" into main