Merge "Make apex_available explicit"