Merge "Mark apex-available" into main