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