Merge "Revert "Add CAS HAL APEX"" into main