Merge "Explicit apex_available clauses"