Merge "Set apex_available property"