Merge "Revert "Set apex_available property""