Merge "apex_available becomes more correct"