Merge "Revert "Revert "Set apex_available property"""