Merge "Update apex_available field"