Merge "Add explicit apex_available clauses"